fixed rule to actually create the symlinks, erroring out if anything goes

2005-11-06  Michael Natterer  <mitch@imendio.com>

	* gtk/Makefile.am (icons): fixed rule to actually create the
	symlinks, erroring out if anything goes wrong.

diff --git a/ChangeLog b/ChangeLog
index 85434ceb4267286a0414deb1fcc44376ecff5369..3bed44b886767c664936f9eb2b49be08965a38f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-06  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/Makefile.am (icons): fixed rule to actually create the
+       symlinks, erroring out if anything goes wrong.
+
 2005-11-06  Tor Lillqvist  <tml@novell.com>
 
        * gtk/updateiconcache.c (build_cache): Can't rename a file if the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 85434ceb4267286a0414deb1fcc44376ecff5369..3bed44b886767c664936f9eb2b49be08965a38f5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-11-06  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/Makefile.am (icons): fixed rule to actually create the
+       symlinks, erroring out if anything goes wrong.
+
 2005-11-06  Tor Lillqvist  <tml@novell.com>
 
        * gtk/updateiconcache.c (build_cache): Can't rename a file if the

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 74e555cec8cf930540210ba0fab1e6935773f8c4..bb5b851affd82e2c70d4c0d4ab67415ea84bf529 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -952,18 +952,27 @@ STOCK_ICONS = \
        stock-icons/48/gtk-dialog-warning.png
 
 icons:
-       for i in 16 24; do                                              \
-          (cd stock-icons/$$i                                          \
-          $(LN_S) gtk-go-forward-ltr.png gtk-go-back-rtl.png           \
-          $(LN_S) gtk-go-back-ltr.png gtk-go-forward-rtl.png           \
-          $(LN_S) gtk-goto-first-ltr.png gtk-goto-last-rtl.png         \
-          $(LN_S) gtk-goto-last-ltr.png gtk-goto-first-rtl.png         \
-          $(LN_S) gtk-media-forward-ltr.png gtk-media-rewind-rtl.png   \
-          $(LN_S) gtk-media-rewind-ltr.png gtk-media-forward-rtl.png   \
-          $(LN_S) gtk-media-next-ltr.png gtk-media-previous-rtl.png    \
-          $(LN_S) gtk-media-previous-ltr.png gtk-media-next-rtl.png    \
-          $(LN_S) gtk-floppy.png gtk-save.png                          \
-          cd ../..)                                                    \
+       for i in 16 24; do                                                      \
+          (cd stock-icons/$$i                                                  \
+          && rm -f gtk-go-back-rtl.png                                         \
+          && $(LN_S) gtk-go-forward-ltr.png gtk-go-back-rtl.png                \
+          && rm -f gtk-go-forward-rtl.png                                      \
+          && $(LN_S) gtk-go-back-ltr.png gtk-go-forward-rtl.png                \
+          && rm -f gtk-goto-last-rtl.png                                       \
+          && $(LN_S) gtk-goto-first-ltr.png gtk-goto-last-rtl.png              \
+          && rm -f gtk-goto-first-rtl.png                                      \
+          && $(LN_S) gtk-goto-last-ltr.png gtk-goto-first-rtl.png              \
+          && rm -f gtk-media-rewind-rtl.png                                    \
+          && $(LN_S) gtk-media-forward-ltr.png gtk-media-rewind-rtl.png        \
+          && rm -f gtk-media-forward-rtl.png                                   \
+          && $(LN_S) gtk-media-rewind-ltr.png gtk-media-forward-rtl.png        \
+          && rm -f gtk-media-previous-rtl.png                                  \
+          && $(LN_S) gtk-media-next-ltr.png gtk-media-previous-rtl.png         \
+          && rm -f gtk-media-next-rtl.png                                      \
+          && $(LN_S) gtk-media-previous-ltr.png gtk-media-next-rtl.png         \
+          && rm -f gtk-save.png                                                \
+          && $(LN_S) gtk-floppy.png gtk-save.png                               \
+          && cd ../..)                                                         \
        done
 
 gtkbuiltincache.h: @REBUILD@ gtk-update-icon-cache$(EXEEXT) icons